Merge

diff --git a/xen/arch/ia64/vmx_vcpu.c b/xen/arch/ia64/vmx_vcpu.c
index 00ad3d297b484f08b63ca10dc20156c1504199d6..46bbe464bc2d0820a67ca003fb5bb029dd3dc9cc 100644 (file)
--- a/xen/arch/ia64/vmx_vcpu.c
+++ b/xen/arch/ia64/vmx_vcpu.c
@@ -213,7 +213,6 @@ ia64_rr vmx_vcpu_rr(VCPU *vcpu,UINT64 vadr)
 
 IA64FAULT vmx_vcpu_set_rr(VCPU *vcpu, UINT64 reg, UINT64 val)
 {
-    extern void set_one_rr(UINT64, UINT64);
     ia64_rr oldrr,newrr;
     thash_cb_t *hcb;
     oldrr=vmx_vcpu_rr(vcpu,reg);